|  |  | @@ -1,6 +1,6 @@ | 
            
            
              | 1 | 1 |  # -*- coding: utf-8 -*- | 
            
            
              | 2 | 2 |   | 
            
            
              | 3 |  | -import json | 
            
            
              |  | 3 | +import os | 
            
            
              | 4 | 4 |   | 
            
            
              | 5 | 5 |  from django.conf import settings | 
            
            
              | 6 | 6 |  from django.shortcuts import redirect | 
            
            
            
            
              |  |  | @@ -155,11 +155,20 @@ def download_api(request): | 
            
            
              | 155 | 155 |      return redirect(get_latest_app(src).get('latest_adr_url', '')) | 
            
            
              | 156 | 156 |   | 
            
            
              | 157 | 157 |   | 
            
            
              |  | 158 | +def kvformat(bpversion, k): | 
            
            
              |  | 159 | +    v = bpversion.get(k, '') | 
            
            
              |  | 160 | +    return '"{}":{}'.format(k, v) if isinstance(v, int) else '"{}":"{}"'.format(k, v) | 
            
            
              |  | 161 | + | 
            
            
              |  | 162 | + | 
            
            
              | 158 | 163 |  def box_program_version_api(request): | 
            
            
              | 159 | 164 |      """ BOX 程序版本信息 """ | 
            
            
              | 160 | 165 |      bpversion = get_box_program_version() | 
            
            
              | 161 | 166 |   | 
            
            
              |  | 167 | +    keys = ['srv_version_code', 'srv_version_name', 'srv_sha1', 'proc_version_code', 'proc_version_name', 'proc_sha1'] | 
            
            
              |  | 168 | +    kvs = [kvformat(bpversion, k) for k in keys] | 
            
            
              |  | 169 | +    bpversion_str = os.linesep.join(kvs) | 
            
            
              |  | 170 | + | 
            
            
              | 162 | 171 |      return response(200, 'Get Box Program Version Success', u'获取盒子程序版本成功', { | 
            
            
              | 163 | 172 |          'bpversion': bpversion, | 
            
            
              | 164 |  | -        'bpversion_str': json.dumps(bpversion), | 
            
            
              |  | 173 | +        'bpversion_str': bpversion_str, | 
            
            
              | 165 | 174 |      }) |